*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46888880d8117f48b5298896fca22ce980f2e6ba..71792ae76fa86ea22f089147fa69103568df7666 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -82,7 +82,6 @@
        continued lines.
        (line-move-1): Remove flawed test for that case.
 
->>>>>>> 1.10122
 2006-09-24  Ken Manheimer  <ken.manheimer@gmail.com>
 
        * icomplete.el (icomplete-simple-completing-p): Use the correct